Skip to content

test: replace mock_methodn macros with mock_method#14450

Merged
alyssawilk merged 2 commits intoenvoyproxy:masterfrom
akonradi:gtest-mock-method
Dec 17, 2020
Merged

test: replace mock_methodn macros with mock_method#14450
alyssawilk merged 2 commits intoenvoyproxy:masterfrom
akonradi:gtest-mock-method

Conversation

@akonradi
Copy link
Contributor

Commit Message: Replace MOCK_METHODn with MOCK_METHOD
Additional Description:
This is a continuation of #13186, but with an additional format check to prevent
additions of MOCK_METHODn invocations in the future.
Risk Level: low
Testing: built affected targets
Docs Changes: n/a
Release Notes: n/a
Platform Specific Features: none

This is a continuation of envoyproxy#13186

Signed-off-by: Alex Konradi <akonradi@google.com>
Signed-off-by: Alex Konradi <akonradi@google.com>
@akonradi
Copy link
Contributor Author

/retest

@repokitteh-read-only
Copy link

Retrying Azure Pipelines:
Retried failed jobs in: envoy-presubmit

🐱

Caused by: a #14450 (comment) was created by @akonradi.

see: more, trace.

Copy link
Contributor

@alyssawilk alyssawilk left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nice!

@alyssawilk alyssawilk self-assigned this Dec 17, 2020
@akonradi
Copy link
Contributor Author

@alyssawilk can you merge?

@alyssawilk alyssawilk merged commit d80afd3 into envoyproxy:master Dec 17, 2020
@alyssawilk
Copy link
Contributor

yeah, sorry, CI wasn't done when you got your LGTM :-)

@akonradi
Copy link
Contributor Author

I figured, just wanted to knock this one off before the long weekend. Thanks!

@akonradi akonradi deleted the gtest-mock-method branch December 17, 2020 19:50
mpuncel added a commit to mpuncel/envoy that referenced this pull request Dec 22, 2020
* master: (30 commits)
  Deflaked: Guarddog_impl_test (envoyproxy#14475)
  [fuzz] add fuzz tests for hpack encoding and decoding (envoyproxy#13315)
  [filters] Prevent a filter from sending local reply and continue (envoyproxy#14416)
  oauth2: improving coverage (envoyproxy#14479)
  owners: Change dio email address (envoyproxy#14498)
  macos build: Fix ninja install (envoyproxy#14495)
  http: use OptRef helper to reduce some boilerplate (envoyproxy#14361)
  doc: update test/integration/README.md (envoyproxy#14485)
  server: wait workers to start before draining parent. (envoyproxy#14319)
  api: relax inline_string length limitation in DataSource (envoyproxy#14461)
  oauth: properly stop filter chain when a response was sent (envoyproxy#14476)
  listener: deprecate use_proxy_proto (envoyproxy#14406)
  deps: update cel and remove a patch (envoyproxy#14473)
  preconnect: rename: (envoyproxy#14474)
  coverage: ratcheting limits (envoyproxy#14472)
  grpc mux: fix sending node again after stream is reset (envoyproxy#14080)
  [test] Replace printers_include with printers_lib. (envoyproxy#14442)
  tcp: nodelay in the new pool (envoyproxy#14453)
  test: replace mock_methodn macros with mock_method (envoyproxy#14450)
  tcp: extending tcp integration test (envoyproxy#14451)
  ...

Signed-off-by: Michael Puncel <mpuncel@squareup.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants